Updated count -> item_count and small changes