Replaced il8n functions with something more robust