Work on 1.3.0-SNAPSHOT