Cleaning up some code and improving config for plugins
Added support for PASS