Add preliminary support for row and column edges