Validation rework