Validation and update