Adding Proper Event and Process Classes