Added swithc logic declarations