add expvar support