WIP on inner join support