Modified `Locator` and `LocatorCollection` classes