CAPX-88 | Handle columns