Improving config