Plan to avoid using DI for experts for this time