Refactor catalog reader data handlers