Adding better support for joins