Adding join checking.