add support for list_value, entity_value