Improve Waffle integration.