Improve Doctrine example