Model changes for app 2