Added switch references