Added EmitterCategory enum and expanded parsing.