Added more scnearios and cases