Fixed onEnable and added more features