Add waitForService to fix service connections