Changed the way plugins are loaded to facilitate the addition of future bug fixes