Rebase extensions