moved container handling inside of storage