Improving DI and adding is dep in client-side components