Checkpoint for backend refactor