Refactor column mappers + doc