Wrapper-specific changes