Added enum class Country and Storname