Doctrine related updates