Update for 0.3.111-SNAPSHOT