Added more cases in main