#320 Create comprehensive vocabulary for Datalynx

Also implements #322