- WIP
- Restructured parts of data provider and data storage
- Several adjustments done, because of shortcomings or missing functionality