Handled 1.6 upgrade requirements