Updated to use action segment class