Added two new field types
Added two new datatypes