Issue #46: Locations 2.0 first version