@Kevin Wang I reworked this PR i think the handling of the join keys is much better now. It should be ready for a final review!