diff --git a/src/fields/DynamicFieldLineItem.js b/src/fields/DynamicFieldLineItem.js
index 370c430..e9e946e 100644
--- a/src/fields/DynamicFieldLineItem.js
+++ b/src/fields/DynamicFieldLineItem.js
@@ -1,8 +1,16 @@
 import React, { useMemo, useCallback } from 'react'
 import PropTypes from 'prop-types'
 import FieldsList from './FieldsList'
+import * as FieldTypes from './type/FieldType'
 
-const allowedTypes = ['text', 'number', 'select', 'date']
+const allowedTypes = [
+  FieldTypes.TEXT,
+  FieldTypes.NUMBER,
+  FieldTypes.SELECT,
+  FieldTypes.DATE,
+  FieldTypes.SIGNATURE,
+  FieldTypes.IMAGE,
+]
 
 export const DynamicFieldLineItem = ({
   index,
diff --git a/src/fields/DynamicListField.test.js b/src/fields/DynamicListField.test.js
index fb836a7..a6e55e3 100644
--- a/src/fields/DynamicListField.test.js
+++ b/src/fields/DynamicListField.test.js
@@ -189,10 +189,20 @@ test('list required validation', async () => {
         fieldType: 'text',
         title: 'field',
         schema: {
-          defaultValue: '',
-        },
+          defaultValue: ''
+        }
       },
-    ],
+      {
+        id: 3,
+        order: 2,
+        fieldType: 'image',
+        title: 'image',
+        required: false,
+        schema: {
+          max: 100,
+        }
+      }
+    ]
   }
   renderForm(field)
   await waitFor(() =>
diff --git a/src/fields/type/FieldType.js b/src/fields/type/FieldType.js
new file mode 100644
index 0000000..f2300e4
--- /dev/null
+++ b/src/fields/type/FieldType.js
@@ -0,0 +1,11 @@
+export const TEXT = 'text';
+export const SELECT = 'select';
+export const NUMBER = 'number';
+export const DATE = 'date';
+export const IMAGE = 'image';
+export const CODE = 'code';
+export const GPS = 'gps';
+export const SIGNATURE = 'signature';
+export const DYNAMIC_LIST = 'dynamicList';
+export const TOTALIZER = 'totalizer';
+
diff --git a/src/fields/useImageStore.js b/src/fields/useImageStore.js
index 8cac003..9a66a1f 100644
--- a/src/fields/useImageStore.js
+++ b/src/fields/useImageStore.js
@@ -6,6 +6,28 @@ export default function useImageStore({
   setFieldValue,
   setFieldTouched,
 }) {
+
+  // const getInitalValueFromField = fieldId => {
+  //   if (typeof fieldId !== 'string') {
+  //     return values[fieldId];
+  //   }
+
+  //   const keysTree = fieldId?.split('.');
+  //   const deepSearchValue = (keysTreeArray, valueObject) => {
+  //     const keyTree = keysTreeArray.shift();
+
+  //     if (keysTreeArray.length === 0) {
+  //       return valueObject[keyTree] || null;
+  //     }
+
+  //     return valueObject[keyTree]
+  //       ? deepSearchValue(keysTreeArray, valueObject[keyTree])
+  //       : valueObject;
+  //   };
+
+  //   return deepSearchValue(keysTree, values);
+  // };
+
   const [initialValue] = useState(value);
   const [imageSource, setImageSource] = useState(initialValue) // TODO: Is this really necessary? it holds the same data as the field value
 
diff --git a/src/helpers/formMapper.js b/src/helpers/formMapper.js
index b4071d4..6431640 100644
--- a/src/helpers/formMapper.js
+++ b/src/helpers/formMapper.js
@@ -1,8 +1,9 @@
 import { parseISO } from 'date-fns'
 import { groupBy, isNil, isPlainObject } from 'lodash'
 import { formatDate, parseDate } from './dataFormats'
+import * as FieldTypes from '../fields/type/FieldType'
 
-const ImagesTypeFields = ['image', 'signature']
+const ImagesTypeFields = [FieldTypes.IMAGE, FieldTypes.SIGNATURE]
 
 export const flattenFields = (fields) =>
   fields.reduce((acc, field) => {
@@ -24,7 +25,7 @@ export const getFieldDefaultValue = (field) => {
 
   let { defaultValue } = field.schema
 
-  if (defaultValue && field.fieldType === 'date') {
+  if (defaultValue && field.fieldType === FieldTypes.DATE) {
     // time defaultValue comes with timezone data from the field schema
     // we need to parsed it
     if (field.schema.format === 'time') {
@@ -41,16 +42,16 @@ export const mapFieldAnswersToFormValues = (
   formValues
 ) => {
   if (formValues[field.id]) return formValues[field.id]
-  if (field.fieldType === 'totalizer') return null
+  if (field.fieldType === FieldTypes.TOTALIZER) return null
 
   const fieldAnswers = answersByFieldId[field.id] || []
 
-  if (field.fieldType === 'select' && field.schema.multiple)
+  if (field.fieldType === FieldTypes.SELECT && field.schema.multiple)
     return fieldAnswers.map((answer) => answer.value)
 
   const fieldAnswer = fieldAnswers[0]
 
-  if (field.fieldType === 'dynamicList') {
+  if (field.fieldType === FieldTypes.DYNAMIC_LIST) {
     if (!fieldAnswer || !Array.isArray(fieldAnswer.value)) return []
 
     return fieldAnswer.value.map((listItem, index) =>
@@ -81,6 +82,7 @@ export const mapFieldAnswersToFormValues = (
       uri: fieldAnswer.value,
       uploaded: true,
       stored: true,
+      textAnswer: storedAnswer.textAnswer,
     }
   }
 
@@ -91,7 +93,7 @@ export const mapFieldAnswersToFormValues = (
   if (fieldAnswer) {
     value = fieldAnswer.value
 
-    if (field.fieldType === 'date') {
+    if (field.fieldType === FieldTypes.DATE) {
       if (field.schema.format === 'date-time') {
         // date-time values comes with no timezone format
         // we need to parse it to internal format with timezone
@@ -146,7 +148,7 @@ const mapFormValueToAnswer = (
   if (
     answersWithId.length > 0 &&
     !touched &&
-    field.fieldType !== 'dynamicList'
+    field.fieldType !== FieldTypes.DYNAMIC_LIST
   ) {
     return answersWithId.map((untouchedAnswer) => ({
       id: +untouchedAnswer.id,
@@ -155,7 +157,7 @@ const mapFormValueToAnswer = (
   }
 
   if (Array.isArray(value)) {
-    if (field.fieldType === 'dynamicList') {
+    if (field.fieldType === FieldTypes.DYNAMIC_LIST) {
       const dynamicFieldAnswer = answers.find(
         (answer) => answer.fieldId === intFieldId
       )
@@ -184,7 +186,7 @@ const mapFormValueToAnswer = (
   }
 
   if (isPlainObject(value)) {
-    if (field.fieldType === 'gps') {
+    if (field.fieldType === FieldTypes.GPS) {
       return [
         {
           fieldId: intFieldId,
@@ -200,7 +202,7 @@ const mapFormValueToAnswer = (
     return []
   }
 
-  if (field.fieldType === 'text' && field?.schema?.format === 'email' && !value) {
+  if (field.fieldType === FieldTypes.TEXT && field?.schema?.format === 'email' && !value) {
     return []
   }
 
diff --git a/src/schema/fieldSelectSchema.js b/src/schema/fieldSelectSchema.js
index 329c2a3..4fde2c2 100644
--- a/src/schema/fieldSelectSchema.js
+++ b/src/schema/fieldSelectSchema.js
@@ -31,6 +31,7 @@ export const fieldSelectSchema = (field) => {
             )
           },
           then: fieldSchema(subformField).schema,
+          otherwise: Yup.string(),
         })
       })
     })