Update for v3.1.1