Configuration re-work to centralise settings