Refactor the Recmap modules (part 2)