Changed DI system slightly to avoid double registration (still needs a rework)