Changed from long to BigDecimal for monetary values