Updated management to pick up settings