Add extended-join support