Move ModelBuilders into the cake