Added timeout for services discovery