Feature/full join support