Add new packet classes and fix up old packet classes