@huchengtw-moz In order to address latest @KenChang's comments you have to rewrite the code here. Please let me know If you need help to understand the changes that we need here.