Further updates for pair changes, reducing number of temporary objects