Updated to 0.7.0-SNAPSHOT