More validation and change discount_rate default value