Refactor of linkage reader