Rewriting property buffer for account