Unified validation
Extreme commit