Added more validations
Added breeze Saving