updated decorators from 0.7.2