Modules' logic changes