Config improved