Added support up to one billion