Removed old Wrapper definition