Added new model
Fixed relations between models