Restructure comboList include to allow more flexibility is column specifications