Updates to work with wreak 0.2.0-SNAPSHOT