Complete changes to Storage interface