Adapt to new codebox