Added switch support for mulitple characters