Added support for resolving services