More code for JoinANNComponent