Add endpoint option, update for latest raw api json.