Adding settings after further inspecting CB-2296