Improving configuration slightly