Config improvs