Fixing the app to use non-generic model building