Add support for graveyard endpoint