Improve support for big joins