Adaptation to format of service changes

Jira Issue:WP-1264