Rebase to include roles and maintain idempotency