Added security features