Completed all functionality for the plugin