Changed map to interface to allow email data to be struct

Just as described above.