Add container and context