Added modulus support