Remove double declaration
Add container