Add generic container
Refactorisation to use quantity in dependencies