added config handling