Some changes for SnD Thread