Work for 1.1-SNAPSHOT