Improved plugins a little bit.
Improved ControllerPlugin.