Support for dynamic services

Jira Issue: WP-1251