Merge with validation changes