Add common swithing