[Hao Wen] - add waffle support.