Making a few changes to idmppcm