Services and DI - Solution