Added onEnable() and onDisable() methods