Add validation for save