Added support for value sets