Add basic attribute preservation