Added support for decimals