Added more functionality to Wrapper.