Removed unnecessary pk fields, added passport and user location.