Add support for initial table limit feature