CS Fixes
Added Plugins