Small changes to app_builder and build model