Added full join support