add support for location