Added internationaization support