Added JoinBuilder handling