add support for locations