Separated checkpoint marker functionality to separate file