Improve generation of methods signature by the Wrapper class