Making doctrine work at last