Adding own class definition
With wrapper class almost done