Adding default and validations