Improve country entity