Refactoring: Item+Node and Edge+Connection