Added support for location objects