Initial support for Inner join and Outer join
Code cleanup