Merge ZongXiaoLing's code
Add comment for Configure Tool and Entity