Added support to composite fields to convert key values into the correct datatype