Create data model
Improve interface