Adapted to run with 4.1.3-SNAPSHOT