Class fixes and better handling of the columns