Filter support for map and set
Added delete and count