Improved Models and Persistence classes