Adjustments to version 1.6-SNAPSHOT