Adapted to latest refactoring in conversionservice