Added email retrieval