Redifined data model

I redifined data model based on better exemination of raw data with Faga.