Removed Doctrine dependency