Changing to new Doctrine's coding style.