Added support for sets