Improve per-partition validation