Refactored WireEditor