Changed service definition to protect finder instance over share it