Fixed wrapper generation