Changed the way plugin is loaded