Update validator to v2.0