Doctrine remapped