Extract more day reading logic out of adapter