Allowing decoration of  service functions

Fixes #5998 issue