Adding positive int support
Adding positive small int support