Added new plugins and minor changes