+ Small refactoring, removed unused imports, using temporalLocation()
entity factory instead of attribute->attributeValue