adapt to cdmlib changes