Add support for yes/no and time fields. [REF #2] [REF #3]