Refactor to new version of genotype reader