Feature/cloudify 2497 new decorators