Add store via object
Fix count function