Converted all calculation classes to use new Dictionary class for concept lookups