Added numeral support