Added switch callbacks