Added support for 'enum' and 'set' field types