Added classes for subtract and repeat