Added new code for base classes