Pass in the entity type and not the DataValue type

Change-Id: I3fc71757e7d1e06008071792e489c692f3171c80