Add a macro for switching