Entity=>Concept, closes #72