Configuration tweaked