Incomplete work for adapting the application to the new XS-based Config