Better service state handling.