Switched entity Id generator to DB-based.