Started using manual DI for dependencies