Touch up Countable class.