ADD: handling of multiple kb versions