Issue #2: Improved container DSL.