Added doctrine extensions support