Refactored graphs