Changed config handling again