Validation and update added