CDI-139, add Unmanaged