improed configuration internal handling