Enablled rest of setops and some refactor