Added Base Class