Refactored packet id to class mapping