Add optional type to Field/FieldList

Need to do check on type consistency.