Adding Counter Cache
Fixed merge
Updated Scope