Feature/en 1889

Let's check this code against Java 5 or 6, I have a feeling that string switches are very new and not supported in those versions.