new location entity and improvements