Added set-row and set-column