Refactoring and new method for joining EJB entities