Validation and updates