Added config mechanism