Added wrap method