Added the cross join feature to Query object. Changed the inner structure. Add some tests.