U: refactor handle-cfg