Migrate waffle to Ninja