Update contracts to support numeric UserId