FindService implementation for #5