* use containerId instead of invDef
* removed idExtension
* coding guidelines