config handling changes