Update for new location fields and functions