A few update for performance test