Added class column selection