Add fields mixin

Ref #119