Add support for MR internal ID