Added wrapping feature