Adding support for checkpoints and goals