Additional validation updates