Support for Doctrine version >= 2.3.3-dev