Updated entity and relationship generation