Moved onEnable/onDisable to separateclasses