[#3400] Update WKCR to new structure