Removed unnecessary location fields
Added location longitude and latitude fields