Re: ClassBuilder changes