Feature/doctrine support