Adapt to DKB layout changes