Renamed storage type to driver
Added StorageFactory