Moved air_type and location from belonging to user to belonging to dive