Good idea @xiaodong-izettle, but I think that can be a part of another pull request if we see a need for it.