add yhat support