Refactor and add Sweden