Improve cross injection to prevent duplicates