Major update, support tagged sets