Replace DataWrapper with generated_data decorator