Add 1.6 support
First 1.6.2 support