Updating email method to support different keys, updating docs