Changed the way modules are enabled/disabled