configuration improvements