1.6.0 support