Refactored to new yEd factory