Added support for synthetic services