Changes to app to support the new configuration