added support for location