also extracting type for each entity now