Added Reader controller and mapping logic