SONAR-5209 Decorators