Complete 'count' and 'verify' modules