Update validation guidelines for 3.1