Fix switch case and more languages support