Added enrichement and switched to bespoke vocabulary.