Further configuration improvements