Refactorign tableFactory
More insights on number of bucket fetched, small refactors
Small refactor on bucket behaviour