Add Countable annotation and aspect.