Renamed jointid to joint