Added supoport for larger numbers