Add PE changes for copy and cookie management