- adapted to cdmlib-ext changes