Fix collection to use countable interface