Added eviction mechanism