Added AddColumnsAndRows