Add missing cleanup field