Feature/combine data