add data choices for tracking
remove code of pb-xpcom