[Wrapper] Add Wrapper class modified from Stefanos A.