[FIX]: improve data and demo data