Changed the field type system