Improvements to enable consuming with decorators (see #92)