Add JOIN support