Refactor DocIDMapper