Added config handling