Better autoconfig