Updates for 1.0-SNAPSHOT