Extended locations with new Entity element