Added support for location