Add support for manually defined named services

Fixes #4