Updated demo, small refactoring of the container