Data models completed