Data Models

* worked on config panel
* improved data model