Hacked up to support storage_classes