Added support for Mixed field types