adding support for locations