Improved storage account handling.