Upgrade to Storage Library 2.0.0.*