Hongyi: update implementation of API