Added new plugins
Generic improvements