fixed multiple data centers and improved Storage.containers