Update validation guidelines for 3.1

Fix #1