added data model
Merge branch 'master' of https://github.com/t-grab/ENA