Update to new DI-API