Added config switch module and improved compatibility.