Change CustomClass to CustomMessage #36