Refactored ElGraph