Building an Enriched Vocabulary