Adding decimal support