added more relationships into models
fixed merge conflicts