@xiangli-cmu we have thought about that, will do that when refactor the code