Added support for location fields