More changes to improve application config