changes supporting checkpoint creation