Model changes to support new app