[WIP COMMIT] Support Date type in FormInstance