Refactored Injection to simplify usage by other tools