Add 5.6 comparable restore functions