Add cellStyle support