Add affix level, and fix CLSK bug