Updated to contain onEnable and onDisable