Finish updating existing features to 1.6