Added class decorators