<DA-204> replace service locator pattern(anti pattern) with dependency injection pattern