Add modulus support