Added item unwrapping