Update for 1.0-M6-SNAPSHOT