updated class and property decorators