Reworked arithmetics to allow composite terms