int instead of uint and update for new data struct support