Better decimal handling