Replace mixin with buff-config