Updated settings to support SDK 10.10