Remove debug, add country mapping