Added support for decimal