Return dict() instead of raw construct.Container
Simplify EETF implementation