Switched containers to container-fluid