Add envelope id to unique args