WIP - Adding multi-file support
Added multi-file support for data models
Merge branch 'master' into dev-branch