API changes

* removed UnitLocator