Checkpoint before adding state machine for HighlightsPoints