Services as models

Adding models for plans and services. Code refining.