Make app config more flexible