Modules overhaul