Adapt to DW 0.7.0-SNAPSHOT