Improving decorators - They are class-based now.