Added base class skeletons