Checkpoint
More changes for refid-refname