Added suppport for Locations and feature children