Add entities
Add country
Fix merge conflicts