Please review branch feature/graphcolumns