Add data model from jonathan