Improve decorators