Added comment class and nb of columns computation