revised ui data model