Adapting to cdmlib version from security branch