Added config management