Add email, keys and security