OC6: Add Doctrine