Added more changes  on collection count