Added more cases for Drotmg