Model for field types
Updated reference types to use field types
Evolution to match changes in models
Cleaned class + 1 new test