GENERAL

• Code refactoring
• Fixed an include when the plugin is disabled