Jiangkun: Add two type of data