Updating the shard related code changes