More changes to allow multi language support