Added support for synonyms (remote services)

fixes #19