Wrapper goes to Base module