Data model changes (v2) 

Original PR: #51