increased modularity of eviction scheme