Added cleanup field