make Wrapper class simpler