Added for 9.X settings