Refactored ITIS connector