Refactor injecting

Expose public api insead of creating methods