Add support for Waffle