Add columns as discussed with Andy