Supporting legacy storage type