Refactored to remove List from modifiers and enum from Locale in order
to generate proper web service