Separate data rebase