[locator] avoid direct usage of RS classes
Merge pull request #20 from amarkevich/master

[locator] avoid direct usage of RS classes