Add CBTable support