Add simple waiting info support