Support for both INNER JOIN and LEFT JOIN - without BC break