Added config loading