Updated to hand the new columns spec