Add support to counted vocabulary