Improve security features