Add support for 2 and 3 digit country codes