Refactored DI, collector now only adds if debug is set.