Add support for GenericValue