changed addresses to be returned as maps of name and address and added headers to read-message