wip-442: Token aware writes