Added Class based inheritance