[TASK] some IoC refactorings at Resource