Added some security stuff