Simplified SAVE STATE events, added wrap method to easily build decorators