Change field types + mixin