Remove dependency only on orm