Better storage container handling