Added more verbose support for locations