Updated email retrieval