Add support for get_row_with_columns