Initial v3.1 changes