Improve persistence support
Update model
Improve persistence support