Minor fixes and implementation of BaseCClass instead of CClass