[TASK] Use Constructor Injection