solve association issue and add sample datas