Added shim to DI