Removing the Doctrine part everywhere since this implementation is generic and not doctrine specific