Adjusting to latest 1.2.0-SNAPSHOT