Updated Server to hold emails