Fixed examples to work with 2.5.0-SNAPSHOT