added support for service location