Issue #164 - adding service