Added Number conversion to generator