Complete rewrite of the application data model structure