Refactoring DBEntsafter ongoing