Refactoring to support multiple JIDs pro participant