Update to use refactor branch until PR is accepted