DDF-138: Added expansion service injection.