Fixed slight discrepancy on EntityKey sub type.
Updated Activity service to ActivityTracking service.