adding classes | adding translation support