Changed Controllers to Plugins