Added TODO about fixing the component update logic
Removed onComponentUpdated event