Added set support