Expression parser changes to support Decimal type