up
Improvement of main data models