DAR-309

Back to the roots changes in setup
Extraction of data model for future