TranslatableListener heavy refactor