Added additional settings