added partial multi table part support