Done refactoring all location functionallity to ObjectLocator