Adapt for new codebox