Added security features and public key