Scheme configuration tweaked