wikipedia mappers refactor