Added rebase functionality