first & rest: update for new mixin schema