Added support for location analsysis