Adding support for remaining field types