Added hash/multi column support