Added a DecimalFormatter to provide proper formatting