Refactoring - introducing translation context