Make model for whearter service
Test service
Improving access to data
Merge branch 'service_refactory_' into develop
Merge remote-tracking branch 'origin/develop' into develop