Plugins improvements.