added property finder
added property locator