Added mapping to Batch eviction as well