Convert source code to 1.6