Doctrine 2 - ORM

[GH-504] Proposed fix for DDC-1241