Updated the BaseDescriptor source code