Now support partition tables