completed - task : modify the way to find service. 

now it's really elegant!