Add support for sets and set again