Module framework change