Add security stuff
Merged security with master