Added more doctrine extensions