Updated files with latest changes from the base class