[TASK] Made registration for event optional and changed structure of TCA - Closes #32