Updated schema with new location fields