Additional validation changes