Added support for locations