Added correct translation support