Refactorer create field methods to use entities
Merge remote-tracking branch 'contributor/fieldupdates' into pr281
Merge of PR 281