Update code to 1.6.0