First version of separate decorators