Modified container management, switched to STL deck