before Persistence was taken out