Changed DataDecorator to return correctly wrapped function