Added some functionality and security actions