Added support for list of locations
Cleaning For locationList support