P1D#11 [Tsatsi, Tshepo] Refactored reader service