CHANGED: moved custom field handling to own mixin