Expand the class for easy CBC