Initial support for variant Custom Fields