Add fallback message generation, new serial for class