Adding container identifiers
Some refactoring and better comments