feature? additionaldata now may contain entities