Adding join/groupJoin features