Updates to 3.1 spec