[FIX] Better graph functionality