locator to match uml

locator fix as well as maps object