Moving towards inversion of dependencies solution