nRepo refactor to handle polyglot