Updates to support 1.6.x