reverted to IEntity and IConcept inside values