Added storage types