195 field refactor

https://github.com/kfgodel/diamond/issues/195