Imrpoved auto config