Replaced most of Data's functionality with DataSource.
Caching of Data tree over server/client