Added more info to switch