Changing returned structure to be consistent with server api.