Refactoring for new Pathway commons conversion