Added multiple table support.