Wrapper improvement