Change Num hierarchy; add more operators