Better config handling