Improved routing and added countries