Untested code additions to Service project :-|