Change module-manager functionality