Rework graph actions