Improved validator version