Added support to resolve unregistered services