Updates for 1.6 Release