WIP: Enhance graph reduction
WIP