Updates to indirect joining