change waffle table to work with new user model