Append terminators to text is now based on enum type.
Added separate classes for defined events (not used yet)