Updated event system to remove traits