Added table sharding to overcome size limit
Sharding with separate tables