Refactor added support to work in branch