Better config management