Changes to service runtime mangement