Managing onEnabled and onDisable better now.