Adding base doctrine support