Added some more security functions