Added some security features