removed separate plugin class