Added support for small int