reorganized persistence classes