Add Fields Factory
Merge branch 'fieldFactory' into develop