PIM-1544 : Refactoring for ORM readers