Refactoring + country chart is added.