Refactored country priming to allow later updates