Changed plugin class to not be a singleton