Added ref/stub for h and i