Updated Universal and GraphController