added Modulo support