Xliff functions refactored