Added DDT Suport+Deleted Scenarios