Added event to org dependency; cleaned up event definition