Refactored SDK to check if the DI even requires replacing