Updates for new location code