Better switch support