Updated Mock class ID generation