refactoring the recent changes on CountriesTrend model